From 0ca3f93aecc57574a2492f2ef2322ad57fd08f7d Mon Sep 17 00:00:00 2001
From: robertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Fri, 14 Feb 2014 17:15:05 +0000
Subject: [PATCH] A round of warning fixes for new issues.

---
 gpsbabel/gui/dpencode.cc    |  2 +-
 gpsbabel/gui/dpencode.h     |  1 -
 gpsbabel/gui/formatload.h   |  2 +-
 gpsbabel/gui/gmapdlg.h      |  1 -
 gpsbabel/gui/processwait.cc |  1 +
 gpsbabel/gui/upgrade.h      |  2 --
 gpsbabel/jeeps/gpsapp.cc    | 12 +++++++++---
 gpsbabel/shapelib/dbfopen.c |  5 ++++-
 8 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/gpsbabel/gui/dpencode.cc b/gpsbabel/gui/dpencode.cc
index 4fc683ec1..4ab5ec020 100644
--- a/gpsbabel/gui/dpencode.cc
+++ b/gpsbabel/gui/dpencode.cc
@@ -36,7 +36,7 @@ using std::string;
 
 //------------------------------------------------------------------------
 PolylineEncoder::PolylineEncoder(int numLevels, double zoomFactor, double vs):
-  numLevels(numLevels), zoomFactor(zoomFactor), verySmall(vs)
+  numLevels(numLevels), verySmall(vs)
 {
   if (verySmall <=0.0)
     verySmall = 1.0E-5;
diff --git a/gpsbabel/gui/dpencode.h b/gpsbabel/gui/dpencode.h
index feb9b2213..c18d80646 100644
--- a/gpsbabel/gui/dpencode.h
+++ b/gpsbabel/gui/dpencode.h
@@ -45,7 +45,6 @@ private:
 		       const vector <double> &dists);
 
   int numLevels;
-  double zoomFactor;
   double verySmall;
   vector <double> zoomLevelBreaks;
 };
diff --git a/gpsbabel/gui/formatload.h b/gpsbabel/gui/formatload.h
index 472a67059..0fd0fe1a5 100644
--- a/gpsbabel/gui/formatload.h
+++ b/gpsbabel/gui/formatload.h
@@ -29,7 +29,7 @@
 
 class FormatLoad {
  public:
-  FormatLoad() {};
+  FormatLoad() : currentLine_(0) {};
   ~FormatLoad() {};
   
   bool getFormats(QList<Format> &formatList);
diff --git a/gpsbabel/gui/gmapdlg.h b/gpsbabel/gui/gmapdlg.h
index 8c67d0542..4f8d61c3a 100644
--- a/gpsbabel/gui/gmapdlg.h
+++ b/gpsbabel/gui/gmapdlg.h
@@ -39,7 +39,6 @@ Q_OBJECT
  private:
   Ui_GMapDlg ui_;
   Map *mapWidget_;
-  bool showWaypoints_, showRoutes_, showTracks_;
   QStandardItemModel *model_;
   QStandardItem *wptItem_, *trkItem_, *rteItem_;
   QList<QStandardItem *> wptList_, trkList_, rteList_;
diff --git a/gpsbabel/gui/processwait.cc b/gpsbabel/gui/processwait.cc
index f3919e3dc..6160b73a8 100644
--- a/gpsbabel/gui/processwait.cc
+++ b/gpsbabel/gui/processwait.cc
@@ -109,6 +109,7 @@ ProcessWaitDialog::ProcessWaitDialog(QWidget *parent, QProcess *process):
   timer_->setSingleShot(false);
   connect(timer_, SIGNAL(timeout()), this, SLOT(timeoutX()));
   stopCount_ = -1;
+  ecode_ = 0;
   timer_->start();
   errorString_ = "";
 
diff --git a/gpsbabel/gui/upgrade.h b/gpsbabel/gui/upgrade.h
index 589d86299..7d8865010 100644
--- a/gpsbabel/gui/upgrade.h
+++ b/gpsbabel/gui/upgrade.h
@@ -50,11 +50,9 @@ protected:
 
 private:
   QString currentVersion_;
-  int upgradeCheckMethod_;
   QNetworkAccessManager* manager_;
   QNetworkReply* replyId_;
   QUrl upgradeUrl_;
-  bool httpRequestAborted_;
   QString latestVersion_;
   QDateTime upgradeWarningTime_;  // invalid time if this object never issued.
   QList<Format> &formatList_;
diff --git a/gpsbabel/jeeps/gpsapp.cc b/gpsbabel/jeeps/gpsapp.cc
index 7a6108ef8..65e2c61f8 100644
--- a/gpsbabel/jeeps/gpsapp.cc
+++ b/gpsbabel/jeeps/gpsapp.cc
@@ -220,7 +220,9 @@ static int32 GPS_A000(const char* port)
     return SERIAL_ERROR;
   }
 
-  GPS_Packet_Read(fd, &rec);
+  if (!GPS_Packet_Read(fd, &rec)) {
+    return gps_errno;
+  }
   GPS_Send_Ack(fd, &tra, &rec);
 
   id = GPS_Util_Get_Short(rec.data);
@@ -881,7 +883,9 @@ int32 GPS_A100_Get(const char* port, GPS_PWay** way, int (*cb)(int, GPS_PWay*))
     return FRAMING_ERROR;
   }
 
-  GPS_Packet_Read(fd, &rec);
+  if (!GPS_Packet_Read(fd, &rec)) {
+    return gps_errno;
+  }
   GPS_Send_Ack(fd, &tra, &rec);
 
   n = GPS_Util_Get_Short(rec.data);
@@ -1152,7 +1156,9 @@ int32 GPS_A101_Get(const char* port)
     return FRAMING_ERROR;
   }
 
-  GPS_Packet_Read(fd, &rec);
+  if (!GPS_Packet_Read(fd, &rec)) {
+    return gps_errno;
+  }
   GPS_Send_Ack(fd, &tra, &rec);
 
   n = GPS_Util_Get_Short(rec.data);
diff --git a/gpsbabel/shapelib/dbfopen.c b/gpsbabel/shapelib/dbfopen.c
index fbe7b0657..552b84377 100644
--- a/gpsbabel/shapelib/dbfopen.c
+++ b/gpsbabel/shapelib/dbfopen.c
@@ -693,8 +693,11 @@ DBFCreateLL( const char * pszFilename, const char * pszCodePage, SAHooks *psHook
     psHooks->FClose( fp );
 
     fp = psHooks->FOpen( pszFullname, "rb+" );
-    if( fp == NULL )
+    if( fp == NULL ) {
+        free(pszBasename);
+        free(pszFullname);
         return( NULL );
+    }
 
 
     sprintf( pszFullname, "%s.cpg", pszBasename );
-- 
2.30.2